Merge remote-tracking branch 'origin/upstream-svn/tags/gpsbabel_1_5_0' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Mon, 12 May 2014 22:37:56 +0000 (00:37 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Mon, 12 May 2014 22:37:56 +0000 (00:37 +0200)

Trivial merge